Merge from mainline.
authorKatsumi Yamaoka <katsumi@flagship2>
Fri, 7 May 2010 12:19:28 +0000 (12:19 +0000)
committerKatsumi Yamaoka <katsumi@flagship2>
Fri, 7 May 2010 12:19:28 +0000 (12:19 +0000)
commitb2f5f0acc84724a00092a866e83d9d6dcd993302
tree5304672b5360803676ccb50fbfc8c498bf7584e7
parent5fcdbba6ce3c493ba6becc6a50d43c2f3e2f69e1
parent5254dd5f4ec365cc9bd49171ddbbc679b6bf2aeb
Merge from mainline.